From: kaf24@scramble.cl.cam.ac.uk Date: Fri, 30 Apr 2004 16:19:02 +0000 (+0000) Subject: bitkeeper revision 1.879.1.8 (40927c76fBFYWVkMyT4Hhbq-SCO6rA) X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~18236^2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=f7a3ec9450a8f4aeb43bfa4ad65636325e756a61;p=xen.git bitkeeper revision 1.879.1.8 (40927c76fBFYWVkMyT4Hhbq-SCO6rA) Fix a mismerge. --- diff --git a/tools/examples/xc_dom_create.py b/tools/examples/xc_dom_create.py index 91fe53217e..0fae2b251b 100755 --- a/tools/examples/xc_dom_create.py +++ b/tools/examples/xc_dom_create.py @@ -261,7 +261,7 @@ def make_domain(): sys.exit() else: - ret = eval('xc.%s_build ( dom=id, image=image, ramdisk=ramdisk, cmdline=cmdline, control_evtchn=xend_response["remote_port"], io_priv=%d )' % (builder_fn, io_priv) ) + ret = eval('xc.%s_build ( dom=id, image=image, ramdisk=ramdisk, cmdline=cmdline, control_evtchn=cons_response["remote_port"], io_priv=%d )' % (builder_fn, io_priv) ) if ret < 0: print "Error building Linux guest OS: " print "Return code = " + str(ret)